Skip to content

Upgrade llama.cpp from b9682 to b9739#247

Merged
bernardladenthin merged 1 commit into
mainfrom
claude/cool-albattani-qpbpw4
Jun 20, 2026
Merged

Upgrade llama.cpp from b9682 to b9739#247
bernardladenthin merged 1 commit into
mainfrom
claude/cool-albattani-qpbpw4

Conversation

@bernardladenthin

Copy link
Copy Markdown
Owner

Summary

  • Upgrade llama.cpp pinned version from b9682 to b9739
  • Update CMakeLists.txt to fetch the new llama.cpp version and add server-schema.cpp to build sources
  • Migrate from server_task::params_from_json_cmpl() to server_schema::eval_llama_cmpl_schema() following upstream refactoring
  • Update documentation and test references to reflect the API migration

Changes

Build System

  • Updated CMakeLists.txt to pin llama.cpp to b9739 and include the new server-schema.cpp source file in the jllama target

Source Code

  • Added #include "server-schema.h" to jllama.cpp and test_server.cpp
  • Migrated parameter parsing calls from server_task::params_from_json_cmpl() to server_schema::eval_llama_cmpl_schema() in:
    • src/main/cpp/jllama.cpp:203
    • src/test/cpp/test_server.cpp:1722
  • Updated comment in jni_helpers.hpp to reference the new function name

Documentation

  • Updated CLAUDE.md with the new llama.cpp version and build instructions
  • Added comprehensive breaking-changes entry documenting all upstream changes between b9682–b9739, including:
    • Build-breaking: server_task::params_from_json_cmpl() moved to server_schema::eval_llama_cmpl_schema()
    • Removed fields: common_params_model::name, deprecated webui config fields
    • Renamed enum: SERVER_STATE_LOADING_MODELSERVER_STATE_LOADING
    • New features: Eagle3 speculative state checkpointing, model file deletion API, agent flag, API key file comments
    • Backend updates: SYCL conv2d ops, CUDA col2im, Metal ROPE support
  • Updated README.md badge to reflect b9739
  • Updated test documentation to reference eval_llama_cmpl_schema instead of params_from_json_cmpl

Test plan

  • Affected unit tests pass locally (test_server.cpp parameter parsing tests)
  • CI is green on this branch
  • Documentation updated with breaking changes and migration guide

Related issues / PRs

Upstream llama.cpp release: https://github.com/ggml-org/llama.cpp/releases/tag/b9739

Checklist

  • I have read CONTRIBUTING.md and CODE_OF_CONDUCT.md
  • My commits follow Conventional Commits
  • No security-sensitive changes

https://claude.ai/code/session_01XjHW4CFNEcj4sB8KksJ4LB

Breaking changes fixed:
- server-schema.cpp added to CMakeLists.txt target_sources (new upstream
  file extracted from server-task.cpp; server-context.cpp now depends on it)
- #include "server-schema.h" added to jllama.cpp and test_server.cpp
- server_task::params_from_json_cmpl() → server_schema::eval_llama_cmpl_schema()
  in jllama.cpp:populate_completion_task and test_server.cpp:parse_params

Non-breaking upstream changes absorbed automatically:
- common_params_model::name → get_name() (not referenced in project C++)
- webui/webui_mcp_proxy/webui_config_json fields removed from common_params
- server_state enum: SERVER_STATE_LOADING_MODEL→LOADING, new SLEEPING value
- on_sleeping_changed → set_state_callback / server_state_callback_t
- cpp-httplib vendor bump v0.47.0 → v0.48.0

New upstream features (available for future Java API exposure):
- common_speculative_get_state/set_state: Eagle3 checkpoint save/restore
- common_download_remove: cached model deletion
- --agent flag: all tools + MCP CORS proxy in one step
- API key file #-comment support (auto-applied for existing setApiKeyFile users)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XjHW4CFNEcj4sB8KksJ4LB
@bernardladenthin bernardladenthin merged commit 1277580 into main Jun 20, 2026
10 of 12 checks passed
@bernardladenthin bernardladenthin deleted the claude/cool-albattani-qpbpw4 branch June 20, 2026 16:47
@sonarqubecloud

Copy link
Copy Markdown

bernardladenthin pushed a commit that referenced this pull request Jun 20, 2026
…fix)

The b9739 upgrade (#247) added tools/server/server-schema.cpp to the jllama
library target but not to the jllama_test executable target. server-schema.cpp
defines server_schema::eval_llama_cmpl_schema(), which test_server.cpp and the
upstream server-context.cpp reference, so the test link failed with an
undefined/unresolved external symbol on every platform that builds the tests
(Linux x86_64, macOS, Windows MSVC, Windows Ninja). The shared library itself
links fine — only jllama_test was missing the TU. Add server-schema.cpp to the
jllama_test source list, mirroring its presence in the library target.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SfvSZ76NW4e1qX1PjL4RKq
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants